//
//  ViewController.m
//  aaaa
//
//  Created by lanou3g on 15/12/25.
//  Copyright © 2015年 李洋. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
//<<<<<<< HEAD
    
    NSLog(@"234");
    

//=======
    NSLog(@"123");
   
    
    
    NSLog(@"liyang");
}
//>>>>>>> 449a1e3b28f14cf4e0eb3c3a2ce94383b08203e8

- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
    
//    NSLog(@"278");
    
//<<<<<<< HEAD
//    NSLog(@"lmn");
//=======
    NSLog(@"678");
//>>>>>>> 66fee13a4fcba3b39cc6b005bd0eccb0fbfb56ae
}

@end
